bitkeeper revision 1.851 (40727a22MmBKMBWlk5lt-AMqNaoA-A)

Reduce Xen heap size to make room for full 4GB pfn_info array.

diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 4fd4990ac013133c31930406746966314b442f6b..3c10cf3ca2f8b68df64583a40e76a56ce582c6cc 100644 (file)
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -213,9 +213,9 @@ void cmain(unsigned long magic, multiboot_info_t *mbi)
     set_current(&idle0_task);
 
     init_frametable(max_page);
-    printk("Initialised %luMB memory on a %luMB machine\n",
-           max_page >> (20-PAGE_SHIFT),
-          max_mem  >> (20-PAGE_SHIFT) );
+    printk("Initialised %luMB memory (%lu pages) on a %luMB machine\n",
+           max_page >> (20-PAGE_SHIFT), max_page,
+          max_mem  >> (20-PAGE_SHIFT));
 
     initial_images_start = MAX_DIRECTMAP_ADDRESS;
     initial_images_end   = initial_images_start + 

diff --git a/xen/include/asm-i386/config.h b/xen/include/asm-i386/config.h
index 28dd1e3e68ba6d97997e40ee8000404e53cef28f..cb550ee17226b8946cb41226ad7390d5511230f3 100644 (file)
--- a/xen/include/asm-i386/config.h
+++ b/xen/include/asm-i386/config.h
@@ -67,12 +67,11 @@
 #define READONLY_MPT_VIRT_START (HYPERVISOR_VIRT_START)
 #define READONLY_MPT_VIRT_END   (READONLY_MPT_VIRT_START + (4*1024*1024))
 /*
- * Next 16MB is fixed monitor space, which is part of a 44MB direct-mapped
+ * Next 12MB is fixed monitor space, which is part of a 40MB direct-mapped
  * memory region. The following are machine addresses.
  */
-#define MAX_MONITOR_ADDRESS   (16*1024*1024)
-#define MAX_DMA_ADDRESS       (16*1024*1024)
-#define MAX_DIRECTMAP_ADDRESS (40*1024*1024) // XXX was 44
+#define MAX_MONITOR_ADDRESS   (12*1024*1024)
+#define MAX_DIRECTMAP_ADDRESS (40*1024*1024)
 /* And the virtual addresses for the direct-map region... */
 #define DIRECTMAP_VIRT_START  (READONLY_MPT_VIRT_END)
 #define DIRECTMAP_VIRT_END    (DIRECTMAP_VIRT_START + MAX_DIRECTMAP_ADDRESS)
@@ -86,8 +85,8 @@
 #define LINEAR_PT_VIRT_START  (DIRECTMAP_VIRT_END)
 #define LINEAR_PT_VIRT_END    (LINEAR_PT_VIRT_START + (4*1024*1024))
 /* Next 4MB of virtual address space is used as a shadow linear p.t. map. */
-#define SH_LINEAR_PT_VIRT_START  (LINEAR_PT_VIRT_END)
-#define SH_LINEAR_PT_VIRT_END    (SH_LINEAR_PT_VIRT_START + (4*1024*1024))
+#define SH_LINEAR_PT_VIRT_START (LINEAR_PT_VIRT_END)
+#define SH_LINEAR_PT_VIRT_END (SH_LINEAR_PT_VIRT_START + (4*1024*1024))
 /* Next 4MB of virtual address space used for per-domain mappings (eg. GDT). */
 #define PERDOMAIN_VIRT_START  (SH_LINEAR_PT_VIRT_END)
 #define PERDOMAIN_VIRT_END    (PERDOMAIN_VIRT_START + (4*1024*1024))